Few updates and Unit-test