Added tests for new "until" option