#663 Refactoring RightsOptionTest and RightsValueTest according to W-J's suggestions.