remove empty test file
Merge branch 'master' into velga-master