Cleaning up more tests that don't require modification from master anymore.