Fix broken tests
Plugin improvements

- use imp for plugin loading
- plugins are now flatfiles rather than packages