Bugfix: wrong usage of uniq()
Repass all tests