Updated test configuration
Merge branch 'Move-files'