Adding fix for current set of tests