Update CHANGELOG, fix tests