Get ready for unit testing. Slight additions to the API namespace.