fix some tests and remove others