fixed tests
Merge branch 'master' into trans-implementation