Proper button focus helper, added tests for button params