Fixing build for server common unit tests.
Minor changes.