Fix for a more general test