Refactored parser tests