Just some test fixes