Corrected line endings
Simplify test for common plugin
Correct test for message id
Accumulated changes