Clean up Unit Test and controller