Fixed tests and driver API.