Remove Naive from tests