[NOJIRA] More test fixes