fixing reply message bug - fixes #18

also improved some tests...