#36 Fix broken tests