Removing only from test-cases