Implemented support for multiple users and fixed broken tests

What an epic copy/past mistake from me :)