- Broader test (why not 12.04.02?)

- Error exit when something amiss
- Simplified