Improve TestRunComplex, othe minor...