Post test #4 fixes