add 1.7 with tests