Unit test improvements.