NOJIRA fixed failing tests