some smaller test fixes