Merge "Removing 2-button support from tests"