Minor test fixes