Formatting fixes
Refactoring tests to use new helper methods

Plus minor formatting fixes.
Formatting fixes
Refactored cs_completer tests some more

Common server-wait code is in a helper func now.