add 1.6 with tests