Fix FindOrInstantiate to actually instantiate element instead of raising an error
Fix parse_strategy tests