Small fix/improvement and tests are green.