Fix unitTests that failed due to changes in CONN-800