Add fixtures for parser spec; modifications to parser and parser spec.