Update DocBlock to reflect the new situation
Optimize code by removing triple function call
Fix tests