Unit tests have been improved.