[3128]Reorganized to avoid errors. Added routing tests.