Use custom Router and update tests

Signed-off-by: Daniel Bondergaard <danielboendergaard@gmail.com>