Merge pull request #1 from cheezy2022/ec-feature-branch-test

Testing rebase here
Updated some specs

User Model & User Controller Specs
Fixed whitespace
Fixed Tests