Updated Subscribe / Collaborator add methods and test

Simplified to take a single input, user, and create a subscriber and
collaborator collaboration types.