Add some tests for controllers