Adapted tests to new Parser-system