Added ChartTest and some SS changes