Added tests and User class