Holding off on merging the tests, this code from the related PR does not look right.