[#3028] Update tests broken by commit ad4c95258ca2