CollectionView spec: Move test classes to the place where they are used

Small cleanup