Make test values more even across types