finish user model
minor changes, thought a test was broken