added test 7 working
merge conflict