Issue #138: Fixing tests affected by dropbutton additions.