refactor users controller and spec