debugging the alg1_nandsim test.  there were some ugly things in the infra which were broken

Change-Id: I72cf4eb85199662baa6a94255c0aa593b74d8edb
a bit of cleanup

Change-Id: I013343f8a9cf9ea890dfd77b156ae13e6ed139c3