CFY-780 removed unused tests