CFY-642 fixed tests and context