Added tests and made a singular and nested url work