Added testFile
Merge branch 'testing'