Updated parser to new Metamodel
Bugfixes for the .scm-parser; reactivated the tests