Readd 3.2 support
Fix tests