Repaired tests that were failing - due to local version of server.