Attribution: Add Mobile and Client Channels and Remove helper functions in test in favor of actual request data