[Carlos] fixing unit tests that got broken by Kenneth's changes.