Refactored test route