Implemented support for multiple users and fixed broken tests

Agree, but I don't think this is a show stopper. We can tweak this guy after we merge into dev and RBAC.