Adapted tests to core route changes