WP-2606 Initial commit of changes related to import testing