Minor refactoring of builders to improve test coverage and efficiency.
Minor refactoring to remove unnecessary lines.
Testing image generation for all charts.