Added base containers to supervisor base config
Fix unittests for new internalization