Fixed the tests - (replaced name with id, change the name of org)