add to changelog
Improve tests