modify all test files
Merge commit 'd122b31b357f547220e7c67c7f843c8abfe06c54' into dev