removed dead code - collectionView not used anymore, because of new modal concept - tests adjusted - part 2