beta7
cleaning tests
Merge branch 'Beta7'