add 3.6 with tests