style fix per @zupo
Make a helper method which asserts that the authenticated user has a
different userid and username.  This method is used in tests which
demonstrate taking action by username vs. userid to ensure that should
this assumption no longer be valid, we can learn of the fact.
style fix per @zupo
fix incorrect username/userid usage
style fixup per @zupo