Checkpoint work on more complex test case.
Improve test case for NmSimple.