Cleanup of server behaviors

* Added eypdoc strings to each method
* Made wait_for methods more consistent with other implementations

Change-Id: I9c9850588d3e084015391347ff97eda7d0ce6765