Sort out test/data commit history a little.