Added sorting to CollectionViewController and tests