Adding user service, some tests (which fail currently, need to fix