Merge branch 'unique' into 'master'

Add tests for jgen --unique-aggregate

See merge request !15
15 jobs for master in 21 minutes and 15 seconds (queued for 8 seconds)