User model/controller scaffolding + test fixes