Parser test refactoring