More testing of button - need to find a better way