Added 1.6 test code