1278 | Subhas/Kavitha | Fix specs and refactored routes