Fix and skip some tests.