NSI 2 (r117) compiles and tests pass