LILY-93: Use factory-boy and fake-factory
LILY-93: factory boy review fixup
Merge branch 'feature/use-factory-boy-93' into develop