Refactored test urls