A slightly better chooser for test-cases