Fix tests for 1.5, 1.6 and 1.7 final