#989 Returning entities with options modifications for firing events
Fixed enum mapping test