CB-7829: Last and final silly update

So many tests