Fixed return statement
Minorly refactored test