other test fixes