- Enhanced tests