Tests updated

Test results will be added later
Merge branch 'master' of https://github.com/JoostvDoorn/VertalerbouwEindproject