This required making a more hi-fidelity fake. That, in turn, required fixing some tests which were just not correct.