Update more tests to either fix or remove them.