Added changelog entry
Changed the right method
Added tests