Add some more tests and fix parser for those cases.