FIX: All tests are passing again