user factory + added some more tests