Fixing tests

Redundant `return` detected.<br>Redundant `self` detected.