Added users and tests