Add tests for updated reply behaviour