Fixing autoscaler test failures