Updated tests, added User controller