CDB-2735 fixed failing spec and found cyclic require and removed it