Fix and remove brittle broken tests