fix on some test cases
Merge branch 'basec' of https://github.com/metaborg/metac into basec