Squashed 'test-library/' changes from 2deffc7..62f636a

62f636a Some changes for 3.1

git-subtree-dir: test-library
git-subtree-split: 62f636a6042710a96ed84c14bd882e0e84429880
Merge commit 'af01ccbae1f6406aeccd0c421a32044fa4f2d1ff'