1.7 compatibility & tests

**WIP** do not merge