Various py.test fixture changes.