Fix tests
Update CHANGES