tests improved
Merge branch 'master' into develop
added greater copy