Code robustness improvement
Update unit test