Fixing reroute, adding test