Slight clean up of tests