simplify test code in preparation for further tests
simplify test code in preparation for further tests

ActiveState/confdis,hpcloud/confdis,ActiveState/confdis,hpcloud/confdis,hpcloud/confdis,ActiveState/confdis