added buttons, test collection