Changed user class and interface, added a unit test for it