Fix broken tests; but they need review