CONN-800:Fix unitTests