Fix plugins.
Fix test.
Merge branch 'er-adjust' of github.com:Gizra/zariz into er-adjust