Add Test Cases, fix minor issues
Add Test for Payment Tool, fix minor issues