1.7 compatibility & tests