Address issues raised on PR

- Updated Changelog
- Added comments
- Added additional test