Added User model and some tests