merged latest 4DK changes to tests