Test fixes and more 1.7 fixes.