Merge "Fix the scope to share a server between tests"