Added unit tests for routing