some other test fixes