made users pretty & some tests