Split Controller and Controller tests into separate tests.