Resolve test issues and an import failure