small test fixes