remove some transient unit test failures, improve import path