Autoscaler cleanup, and rearanged test structure.