Clean up tests

Just some easy stuff that bugged me as I read the test code