leaf change and more tests
leaf change and more tests