Switch to using py.test