Merge "Make test.py and clients.py as stable for plugins"