better configuration handling (esp. for test suite)