Started with a simplifier
Merge branch 'kemi' of github.com:software-engineering-amsterdam/sea-of-ql into kemi
Fixed a few failing tests (old syntax).
Refactored the tests to remove quite a bit of duplicated code and import stuff.