Deleting out-dated tests
Merge branch 'master' into develop