Can you add a unit test for some of these new methods? I don't see any new tests below, just reorganized test cases.