Testing and minor API updates.