Updated testsuite for 3.3