FIX: Update tests