Separate Leaf and NonLeaf test

All tests ran positive