Updated tests to allow for role-based testing(#158)