Fixed conflict due to merge

A junit test from issue227-2 wasn't compatible with the new LocalPlugin.