Minor test fixes and missing imports