Test Fix #JAWR-290