Fix tests to assure 1.2.16 compliance