Fix Plural rule parsing and update tests