Improve unit testing.