Merge "DX: Fix tests 029, 033, 116, 117"