improved parser; a test for the parser