Fixes with tests for all routes, including /z/