Improve unit test
Improve unit test