fixing routes and tests