[update:] adding more tests