Fix more tests by removing code