fix broken tests
Get client server tests running again after wire refactoring

* not all tests passing yet
* using globals, should still be refactored out