Remove tests for code that got moved out