Fixing tests
Merge branch 'master' into api-influx