Add missing stuff for all button

Also increase code coverage