Enhanced tests.