Fix tests

Tests now work automagically all the way to 3.2 (3.3 has not been fixed yet).