Remove unused files, add new tests for URLValidator