corrected test suit
various fixes