[tests] moved model files tu subdirectories
[collection] make ArrayCollection valid to instance