Improved existing unit tests.