devise test models and stuff
merged conflicts