Fix broken tests?