Update Fidelity

Merging in #748 and updating exceptions in the Yaml to reflect this as well.