+1 to Stefan and Peter. I would prefer to have tests kept within their class 
by default. It's the most intuitive.