Fix failing BuildURL tests