Added User class and tests