Added additional tests, fixed NSR HR bug.