Use provider interfaces for the parser; enhance test case.