more cleaning in test-generator and test-lib