Further enhanced tests.