#4137 Fix tests