Refactor Tests
Add User