Add test cases for bug 1188 and bug 1936: subst problems