Tests updated to match feedback from @dwd