Changed return statements
Refactored Tests