Fixed failing test and added filter by orgnization type