Updated tests to support the new users dict