Got Both controllers to test
Got Both controllers to test, reformatted code with comments