small import and test fixes