Tweaking import statements to prevent errors and hopefully fix the test issues.