Fix broken tests. Again