Section of tests are revised by Jeff