Address minor comments on tests for CPS-577