Fix Tests for Substitutions