Added tests to grafana. Small modifications of collectd tests.