Merge "Fix and improve server personality tests"