Add tests for custom routes
Add status validations