Restructure routing testing