Extend Parser interface to simplify tests