1) Fixed folding.
2) Added extra validation after test.