Merge "Remove skips in test server rescue"