more fixes for offline controller testing, need to test generate offline issue on tw-merge