Controller refactor, group test file added