Fix: tests failed, now they don't