1. Added more tests for registration association controller
Merge after updaing the tests for registration association controller
1. Dealt with the merge conflict in the router.rb file and now all tests passed