Fix slowdown of server/ unittests and prevent possible flaky test
Merge pull request #141 from embark/embark/fix_slow_server_tests

Fix slowdown of server/ unittests and prevent possible flaky test