fix tests
Merge branch 'feature-fixT' into develop