FIX: Fix broken testing