Clean up plugin descriptor.
Improve unit test assertion helper.
Merge remote-tracking branch 'origin/master'