Update changelog
Better test coverage