use more thread-safey test_server

Signed-off-by: Ted Young <tyoung@pivotallabs.com>