some small test fixes