Add some test fixes that missed the boat