Add new annotations
Fix tests for j2converter
Update idea versions in plugin.xml