Fixes error with test where the wrong id was being searched for in the route.  It also dries up the tests by moving arrange tasks to before block