Fixed to a more general test