Better py.test support