CDEC-66: fixed tests