Remove dependencies from the listener in the generated tests and simplify the way we delete the generated data