Added remaining tests for new routes
Ajusting routes to singular
Merge branch 'master' of https://github.com/kadu/CIOT