merging a change in tests to master