added some tests for the acceptor
Merge remote-tracking branch 'origin/add-acceptor-tests' into add-tests
Adding client