Condensed test_parser considerably.