develop: fixed more broken tests, couple still failing
develop: fixed more broken tests, couple still failing

grafana/grafana,grafana/grafana,grafana/grafana,grafana/grafana,grafana/grafana,grafana/grafana,grafana/grafana