Not so little unit test cleanup