a bunch of test reorganization so that unit tests and server test are st...

...andardized across workers