FIX: Fix tests