Unittests (31) added
Merge branch 'martin' of https://github.com/Thad54/swe2 into martin