Improve ordinals tests