Add tests for custom routes
Add status validation and tests