Finished ControlPanel tests
Controller tests done
Merged ben and mikes tests
Ben code review