minor optimisations
end-to-end tests fix (realising that ordering of returned acks/messages should stay the same *always*)