Follow ups. Working on 2/3 now.

It's important to pass the doc test script straight to py.test,
otherwise it finds the doctest file by default.