Port to pytest fixtures