Oat 31

Delivery extension quality, unit tests