Unwrapped bottom and preimage arrows
Added termination tests