JBIDE-13557 additions for test and needs a merge