Fixed tests
Merge branch 'master' of https://github.com/mtp26/deliverable3