Fix plugin to match latest master

Instead of passing a provider, we do a .get() and pass the entry.
The tests have been updated to use @After instead of manual teardown,
this to prevent warnings from JUnit.

Change-Id: I2867bbd69f15d6f14d9cae3ca4bc04959d259a87
2 files changed