Remove some tests that may not be necessary