Readd parts of tests that should not have been removed