Tweak WorkingHours string formatting

Also tweak unit tests.