gbp: More reliable unit-tests