More URL tests & TODO tests