Fixed some test already existing
Merge branch 'develop'