Add some other test cases
Change visibility of some private methods