Fixing unit tests after rebasing with latest changes [brandon-eum]