remove superfluous arguments
add routing tests