JBIDE-15915 - Bug fixes and changes to ensure green build, verify all previous tests pass

Bug fixes and changes to ensure green build, verify all previous tests pass

JBIDE-15915 - fix last unit test