Changing samples to use Ids, instead of email to work on greenhouse

Unit tests passed for dojo 143 & 180 on an up to date branch