Minor routing changes. Updated tests to match