Minor improvements in the unit tests.