Fix for plugin dependency test
Cleanup some cruft in test code