fixing tests and routing issue
fixed tests
Merge pull request #26 from macheteshuffle/tests

Tests