added some tests for name substitution