Add user tests and refactor old tests