Added controllers and test cases