Merge "Keep more builds for tests"