updated 002 tests for new value/next semantics