Parser fix and additional test cases