4.4 fixes (the test)