Clean up return statements.
Clean up test file.