Add more unit-test, in progress