Add more tests to controller