Reorder methods
Handle explicitly when user is None
Add more reservation tests