Fix returned reference
Underline test off by default