fixup failing tests
refactor AuthHelper return data, fix activate result