Implement basic test cases
Refactoring controller approach