Improve unit tests.