Fixed failing tests in MainControllerSpec & UserSettingSpec
Moved the user controller tests to a separate package
Merge pull request #718 from aaron-edwards/master

Fixed failing tests in MainControllerSpec & UserSettingSpec