Add tests, support valueLink