Improved some unit tests.