JBIDE-13913 - adding test
Merge pull request #70 from snjeza/jbide-13913a

JBIDE-13913 - adding test
JBIDE-13662 part 2
small typo JBIDE-13711
JBIDE-13948
JBIDE-13947 to master