add tests to parser, fix wrong naming