Resolved conflict
Changed some files
Changed test05
Changed test04
Changed test03
Changed test02
Changed test01
Merge conflict in test01 resolved