Move a few GitAPITestCase methods to more closely match merge proposals

Clean-up, no change of test content