Fix double space in tests (fixed in 2.7+)
ns/collection has been unified in 2.7 it seems
2.7 returns options and flags keys too
Merge remote-tracking branch 'upstream/v1.5'

* upstream/v1.5:
  2.7 returns options and flags keys too
  ns/collection has been unified in 2.7 it seems
  Fix double space in tests (fixed in 2.7+)