Add test programs and test case and fix trivia associated with rewritten "dynamic" type