Updated testfile
Updated files
Added test merge
Merge branch 'cr1001'