Routing + Testing enhancements