Fixing tests

Redundant `return` detected.