Fixed broken empty tests run
Merge branch 'master' into dashboard