couple of test fixes