Enhance Controller Unit Test