[update:] support with more tests