Change method name
Add unit tests