JBIDE-13557 additions for test