made some changes to tests, button names