fixing tests to better match data now coming back from the router