Fix broken tests due to changes in dc4b54e