Add additional tests for more routing scenarios

Fixes #12