Improve unit test.