Added tests for custom routes
updated models for validation