Implements most of @gvwilson's comments. humantime-test currently fails until rule is defined.