JBDS-3043 - replaces missing test, fixes broken function

JBDS-3043 - replaces missing test, fixes broken function

JBDS-3043 - replaces missing test, fixes broken function