Added a couple more unit tests.
Merge branch 'develop' of https://github.com/elyas-bhy/CampusUB1 into develop
Added a couple more tests.