got rid of unecessary tests