Add scenarios for object generation
Reduce duplication in scenarios