Remove some tests that will be replaced