FIX: Fix tests
FIX: Fix tests