Refactored test routes