4.4 test functionality backported