Fix/duplicate

added fix for api v3 duplicates, commented out v2 api, fixed tests