adding reordering event server
adding reordering event server tests
Merge remote-tracking branch 'origin/master'