Move to test.
Merge pull request #1042 from tweise/hds

Move to test.