Added test3
added test 6
added test 4
Merge branch 'test2'