CATS-513 Refactor settings controller and write test