Improved importing of test data