Completed the test-controller refactoring. (1.2.00)

Completed the test-controller refactoring.