Fix regression introduced by d4e6cdf (with test)
Minor: switch until -> to (blitz was fixed a while ago)
Add more tests and tidy

Tests for empty, supported collections, concat, flatten