WP-2606 Initial changes related to import testing