CURATOR-161 - Updates to unit tests.