Fix some broken tests and remove some unnecessary ones.