test fixes
warning cleanup