@chrisndodge Do we have tests for this new code?