Just a little unit test cleanup