Merge "simplify heat test_limits"