(#2342) - more progress on fixing failing tests