reword test suite for new api.  not yet passing.