organization and search integration tests
merge fixed