Some tests have been improved.