Added route and fix test