fix some tests, remove some tests