Fix test
Update ChangeLog
Prepare release