Test suite improvement.

Avoids quit hanging + better verbose logging