Fix tests for with.passport