Outline of necessary tests.
API tweaks.