fixed broken tests and some functionality to fix the issues of test failures
added functionality to handle multiple educational organizations returned for an entityId