NOJIRA improved testability and correctness