first two tests pass in refactored table-driven mode