Tests for until

Tag 0.9.21