Tidy up initial tests.