Please add tests for this portion of the PR.