test fixes and dep change