Just a couple fixes to get test working, parser works just fine