Fix tests.
Merge pull request #1926 from brendandburns/docs

Fix tests.