Better test conditions (support Makegood)