reorg'd API, reorg'd suites in unit test