LILY-93: Use factory-boy and fake-factory