Add more tests and logic to user and match