Create .test file
Fixes after CR
Merge branch 'case-3999' into development