#2 reconciled unit tests with recent changes (CCT-62)