Merge "Fix plugin.py test directory"