Changes to topics/testing
Merge pull request #2406 from dangerdan/testing

Resubmitting pull request, changes to docs: topics/testing