Added dupe test
Many fixes