clean up, comment out some nondet tests