Manually merging Fabrice pull request for tests