Settings controller refactoring and added tests

Refactored settings controller methods to more accurately represent
purpose and added tests for setting controller methods