some test fixes