Code checkstyle

Update CHANGELOG

Update CHANGELOG

Update CHANGELOG

Update CHANGELOG

Update CHANGELOG

Update CHANGELOG

Update CHANGELOG

Improve unit tests

Update CHANGELOG