GH-30 fix up server wrap test. add performance test.
GH-30 merge