Improve unit test (2)