testSubstitute draft working
Updated testsuite to proper generic expansion