Update NationalMeasurementUnitSet spec in accordance to changes

Also converts to new rspec syntax