FIX: Fix testing