Fixing test
Merge pull request #590 from walmartlabs/user/eran

Support multi directory path
Merge pull request #591 from wpreul/master

Fixing test to be isolated
refactor router