Cleaning up tests and controller