fixed some previous test cases and added test cases for statemachines
Merge branch 'master' of https://github.com/metaborg/metac