Improved a few tests to include new fields and charts.