Add ButtonItem and test