Fix broken tests, case #21