Inline defaults

Extract them later if reuse necessary
Clean up factory fixtures