more consistent msg queue, more tests!