WIP: py.test

Moving us toward py.test use