3.1.x testing

Tests changed to be similar to tests on 3.0.x