Refactor tests and Users View