NOJIRA Refactor of session classes and tests