Updated broken tests and broken Array rewriting of routes.