Thanks - I think I've got it, but I'll enlist you on review. I worked a few hours on it last evening and I think I figured it out in the shower this morning. The CI error is real, but its not a production code issue, just an issue with doing this in a unit test vs IT. I hope to maintain ~unit-ness.