Fix all remaining problems with invker setup
Fix unit tests broken because of setup changes