fix some tests, break others