Use Util function in Button tests
Merge from master