Clear out most of the redundant tests