Improved the unit tests.