added junit tests
Merge branch 'HEAD' of https://github.com/Lambwatt/SEng426Part4.git