*8787* Various test fixes