FIX: Improving test compatibility