Fixed tests

These failures were caused by the new plugin
architecture.

Change-Id: I6bc20100f9a46b9a68e2fb88799231a3e46b4eb6