Update Generic route unit tests to reflect new API