Reorganizing test includes
Test page for buttons #57