Update test statics to be 3.1 compatible