Improve route testing