Fixed user routes and tests