Removed unneccesary tests