Fixed parser test failures