fixed tests folding