Get my unittest working and add some for the new API.