Started adding a test for ImageButton. Cleaned up a few things in ImageButton.