Don't check unless new_route_name isn't nil
Add some more tests