Fixed Non-leaf test cases and functions, 2 more functions to test and implement