Remove tests that are already being run implicitly, add better test coverage