Updates for v3.1.0 testing