Cleanup of controller-testing-code