Robustify AutoScaling tests
Merge remote-tracking branch 'origin/testing' into testing