Remove tacit dependency on external declaration source files
Revise assertions in generator test