Fix tests related to colors and Button state