test improvement + paste
Merge branch 'develop'