fix conflicting test file
Merge branch 'master' into tmp