HY-1666 Add tests.