Enhanced tests