Import tests cleanup