Removing unecessary tests