Adjusted Button structures and added tests