Add back switching to the right org before all ak tests
Fix renaming error for system group test