Make tests compatible with coverage measurement: 66% tested !!!