Rehabilitate controller and routes tests that don't use timing