fix tests following url rewrite changes
refactor
refactor
refactor