Updated plugins, added resource plugin
Fixed tests

- Removed unused method
Updatd tests