more enhancements, preprocess tests