pipe correction and some other small changes in test system