Unit tests for Callout and User
Add more_tests branch
Clears conflicts and gets tests to pass