- Add loading state to give user feedback that the action is in progress
- Update error message to be more specific
- Move some specs to more appropriate locations