Merge "Refactoring hostside network restrictions tests" into main