Did refactoring in users/settings controller

Made the method names more meaningful and fixed some tests