Fixing that last fix, which broke the unit tests