Improve unit test (2)
Improve unit test (3)