Make test org a system property