Revert "Revert "1006test""

This reverts commit 1d6ecb43f336be70333dc22616c0f61764bfa88c.