Import more tests from core