[PLAT-6853] fix up failing deprecated tests (again)