Fix failing tests.

The plugins were re-organized while #3643 was in progress. This cleans
up the test failures post merge.