Updates for unit test JBIDE-17724