added last two methods and some more test code