Hardening tests
Better 2.10 compat