Unit Test added
Merge branch 'master' of https://github.com/GeStanley/COMP_5541