Added more tests to situation and organization policies