additional test fixes