Cleanup tests

review2491002