Autoscaler - New test cases, cleanup.