Improve substitution-related naming
Reorganize test.rkt