more unit test fixes
Added basic support for Target modules  & SNAT fixes (still broken)