Tests updated for v4.