Fix tests for 3.3