CHANGELOG updated
Enriched test coverage