Removing lots of tests