Skip some tests, fix others