WV: routes improvements and testing