Fixed the failing shared-server tests.