Better tests for substitutions