Switching to py.test