Changed Test File
Important changes
Merge branch 'dev'