Comment more race errored tests and code.