More tests pass.  Cleaned up plugin_test api a bit