added tests
Merge to local

Merge branch 'master' of github.com:KULeuven-DeptCW/AaC-Exc