update to new reroute package
tests for subcomponents