Customized Routes, fixed tests, refactored code