udpated test in develop
Conflicts fixed