Change Details

We have fairly good test coverage here already, I mostly just realigned the existing test coverage to explicitly call the new code.