Some changes to the draft

Expansion on make defaults and flow when running tests