Synced task_server_test.py with recent chagnes to task_server.py.  All tests pass.