Cleaning house - removing unecessary tests