small issue in tests
Merge remote branch 'origin/testing' into testing