FIX: broken tests