Attempt to make API more consistent. Make unit and mock testing easier for users.