Allow multiple button types.  Fix getButton tests.

When defining a button, you can now pass multiple types as a button.
eg: quiet progressive

Correct issue with getButtons tests.
Added quiet progressive button test.

Change-Id: If142be0de35e171a61e9c731788cddee9a190ae2
Merge "Allow multiple button types.  Fix getButton tests."