Update to py-test-2.6.1.

Test failures.