Added some test cases and changed some minor stuff
Merge branch 'master' of https://github.com/software-engineering-amsterdam/poly-ql.git