#1160 - Fix broken tests