Added user methods and tests