Eliminate some tests which are no longer needed (covered by sampling tests)