Refactor URL handling
Test CNN URL handling
Change CNN URL test