Cleaning up payments tests again