Fixed routing - Fixed Unit testing - Added Routing Unit Test