[FIX] Ensure tests are passing