Reconciled tests with new code
fixed routing