Updated Button and ButtonTest.
Skipped DropdownButtonTest since buttons are now different