Commit before checkout.
Fix the tests.