Fix missing org in env tests
Fix missing url in systems tests