Change structure to allow changes to the buttons HTML
Corrections to tests