CFY-959 restore testing changes