more test updates and refactoring of pad class