Improve handling of some pathological cases in test case archetypes