Security groups extension changes to pass unit tests