fixed issue with -include-sources during incremental compile

- fixed other tests dealing with new layout
- all tests pass using the update js names for framework