Partial move from unittest2 to py.test