[TEST] Modify import tests and clean the code