Modified the tests for better charts