fixed scale down ack and added colocated tests to test suite run
Merge pull request #1710 from andytaylor/master-fix

fixed scale down ack and added colocated tests to test suite run