Autoscaler - Few more tests, refactoring of existing test code. Cleanup.