Fixed duplicates in list and added more tests