Import and test fixes.