NOJIRA Minor formatting changes, new test