Fix test file path
Merge branch 'master' into lookandfeel