Update test suite to reflect desired API.
Implement new API.