rework on few things
just tests

Signed-off-by: Willi Ye <williye97@gmail.com>