Minor fix to run one of the tests.
Added tests that are broken because of the recent restructuring.
Merge branch 'master' of https://github.com/cwi-swat/rascal.git