add new changes in stackforge and add unit tests for nt