Clean up and speed up route tests