Renamed method
Added unit test