A few more test substitutions