Added some tests that had been missing. Also started controllers