Reorganize tests, add tests for Supply.uniq