CFY-1185 fixed tests and remove redundant assertions