Merge "Test descriptions should depend on the test so they get rebuilt."