More tests. Charting improvements. Deprecated requirement.