Improved import tests