The "test" command was not respecting "set origin".
Remove useless "+ 0" in the previous patch.